added error to BablConversion

diff --git a/ChangeLog b/ChangeLog
index 3d755ec31638332322b703cd0c1356f633dd8356..064f3b0bb2ac78d08fbc2e5aa4a42d48fc1540f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-09  Øyvind Kolås  <pippin@gimp.org>
+
+       * babl/babl-classes.h: added error to BablConversion.
+       * babl/babl-conversion.c: (conversion_new), (babl_conversion_new):
+               track changes to fields in constructors.
+
 2005-09-08  Øyvind Kolås  <pippin@gimp.org>
 
        * Makefile.am: build extensions before tests.

diff --git a/babl/babl-classes.h b/babl/babl-classes.h
index a4e298927e8d39fdd16ac9b448597409594e896d..6e340bf54ff09cfda6b565ab72536944e54fc08a 100644 (file)
--- a/babl/babl-classes.h
+++ b/babl/babl-classes.h
@@ -107,7 +107,7 @@ BablConversion {
   union Babl            *source;
   union Babl            *destination;
   int                    time_cost;
-  int                    loss;
+  double                 error;
   union
     {
       BablFuncLinear     linear;

diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index 9a52b1b2b6133dc420bb74f62bb2d4a3a1567159..7d419efa49c8c3c6f18b1dcc99f5f6f7e2cd2015 100644 (file)
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -36,8 +36,6 @@ conversion_new (const char        *name,
                 int                id,
                 Babl              *source,
                 Babl              *destination,
-                int                time_cost,
-                int                loss,
                 BablFuncLinear     linear,
                 BablFuncPlane      plane, 
                 BablFuncPlanar     planar)
@@ -92,8 +90,7 @@ conversion_new (const char        *name,
   babl->instance.name          = babl_strdup (name);
   babl->conversion.source      = (union Babl*)source;
   babl->conversion.destination = (union Babl*)destination;
-  babl->conversion.time_cost   = time_cost;
-  babl->conversion.loss        = loss;
+  babl->conversion.error       = 0.0;
 
   babl->conversion.pixels      = 0;
   babl->conversion.processings = 0;
@@ -130,8 +127,6 @@ babl_conversion_new (void *first_arg,
   Babl              *babl;
 
   int                id          = 0;
-  int                time_cost   = 0;
-  int                loss        = 0;
   BablFuncLinear     linear      = NULL;
   BablFuncPlane      plane       = NULL;
   BablFuncPlanar     planar      = NULL;
@@ -185,14 +180,6 @@ babl_conversion_new (void *first_arg,
           planar = va_arg (varg, BablFuncPlanar);
         }
 
-      else if (!strcmp (arg, "time-cost"))
-        {
-          time_cost = va_arg (varg, int);
-        }
-      else if (!strcmp (arg, "loss"))
-        {
-          loss = va_arg (varg, int);
-        }
       else
         {
           babl_fatal ("unhandled argument '%s'", arg);
@@ -207,7 +194,7 @@ babl_conversion_new (void *first_arg,
   assert (destination);
 
   babl = conversion_new (create_name (source, destination),
-       id, source, destination, time_cost, loss, linear, plane, planar);
+       id, source, destination, linear, plane, planar);
 
   { 
     Babl *ret = babl_db_insert (db, babl);